Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 22:38:52 +0000 (15:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 22:38:52 +0000 (15:38 -0700)
commit983a60297d1ded9e594f94127f6064764d853d34
tree03a4f507b447aed7c9e94c6c47588d47ef733db0
parent1ec9e27909036f27c3f52d9a48d5f657c7b037de
parent3a91b4a9293c0cc7a5dc27d086fae5395b6550cb
Merge from trunk.